Ticket #2134: gdal-1.5.0-ogr2ogr-sql.patch

gdal-1.5.0/apps/ogr2ogr.cpp

@@ -77 +77 @@
-    OGRGeometry *poSpatialFilter = NULL;
-    const char  *pszSelect;
-    char        **papszSelFields = NULL;
-onst char
+har      
-    int         eGType = -2;
-
-/* -------------------------------------------------------------------- */
@@ -376 +376 @@
-    if( pszSQLStatement != NULL )
-    {
-        OGRLayer *poResultSet;
+        char *sql_pos;
+        char *sql_statement;
+        int  isFile= FALSE;
+
+        /* allow passing a local file instead of text for    */
+        /* SQL statement. This hack is due to the            */
+        /* limitation of the command line (See ARG_MAX)      */
+        if( (sql_pos= strstr(pszSQLStatement,"file://")) != NULL )
+        {
+#define kSQLSTATEMENT_BUFLEN 10240
+             char *sql_file;
+             FILE *fp;
+             char buf[kSQLSTATEMENT_BUFLEN];
+             sql_file= sql_pos+7;
+             size_t size_S= kSQLSTATEMENT_BUFLEN;
+
+             isFile= TRUE;
+             memset(buf,kSQLSTATEMENT_BUFLEN,'\0') ;
+             sql_statement= (char*)malloc(kSQLSTATEMENT_BUFLEN) ;
+             if ( (fp= fopen(sql_file,"r")) != NULL )
+             {
+                 fgets(buf,kSQLSTATEMENT_BUFLEN-1,fp) ;
+                 strcpy(sql_statement,buf) ;
+                 while( (fgets(buf,kSQLSTATEMENT_BUFLEN-1,fp)) != NULL )
+                 {
+                     sql_statement= (char*)realloc(sql_statement,size_S+kSQLSTATEMENT_BUFLEN) ;
+                     size_S+= kSQLSTATEMENT_BUFLEN ;
+                     strcat(sql_statement,buf) ;
+                 }
+                 fclose(fp);
+             }
+             else
+             {
+                 CPLError( CE_Failure, CPLE_AppDefined,
+                           "--sql option : file %s is unreadable.",
+                           sql_file);
+                 exit( 1 );
+             }
+             pszSQLStatement= sql_statement ;
+#undef kSQLSTATEMENT_BUFLEN
+        }
-
-        if( pszWHERE != NULL )
-            printf( "-where clause ignored in combination with -sql.\n" );
@@ -385 +426 @@
-        poResultSet = poDS->ExecuteSQL( pszSQLStatement, poSpatialFilter, 
-                                        NULL );
-
+        if( isFile )
+        {
+          free(pszSQLStatement) ;
+        }
+
-        if( poResultSet != NULL )
-        {
-            if( !TranslateLayer( poDS, poResultSet, poODS, papszLCO, 
@@ -502 +548 @@
-            "                     copy to the new layer (defaults to all)\n" 
-            " -where restricted_where: Attribute query (like SQL WHERE)\n" 
-            " -sql statement: Execute given SQL statement and save result.\n"
+            "                 The statement can be a local file with the\n"
+            "                 file://path_to_sql_file syntax.\n"
-            " -skipfailures: skip features or layers that fail to convert\n"
-            " -spat xmin ymin xmax ymax: spatial query extents\n"
-            " -dsco NAME=VALUE: Dataset creation option (format specific)\n"