瀏覽代碼

* fcl-db: oracle connection
+ metadata retrieval: fix retrieving DATA_DEFAULT column with LONG datatype from ALL_TAB_COLUMNS: oracleconnection does not support the legacy LONG datatype.

git-svn-id: trunk@27980 -

reiniero 11 年之前
父節點
當前提交
f7b6bbdf8b
共有 1 個文件被更改,包括 4 次插入2 次删除
  1. 4 2
      packages/fcl-db/src/sqldb/oracle/oracleconnection.pp

+ 4 - 2
packages/fcl-db/src/sqldb/oracle/oracleconnection.pp

@@ -1026,11 +1026,13 @@ begin
                           'NULLABLE as column_nullable, '+
                           'NULLABLE as column_nullable, '+
                           'DATA_LENGTH as column_length, '+
                           'DATA_LENGTH as column_length, '+
                           'DATA_PRECISION as column_precision, '+
                           'DATA_PRECISION as column_precision, '+
-                          'DATA_SCALE as column_scale, '+
-                          'DATA_DEFAULT '+
+                          'DATA_SCALE as column_scale '+
+                          {DATA_DEFAULT is type LONG; no support for that in 
+													 oracleconnection so removed this from query }
                         'FROM ALL_TAB_COLUMNS '+
                         'FROM ALL_TAB_COLUMNS '+
                         'WHERE Upper(TABLE_NAME) = '''+UpperCase(SchemaObjectName)+''' '+
                         'WHERE Upper(TABLE_NAME) = '''+UpperCase(SchemaObjectName)+''' '+
                         'ORDER BY COLUMN_NAME';
                         'ORDER BY COLUMN_NAME';
+    // Columns of tables, views and clusters accessible to user; hidden columns are filtered out.												
     stProcedures : s := 'SELECT '+
     stProcedures : s := 'SELECT '+
                           'case when PROCEDURE_NAME is null then OBJECT_NAME ELSE OBJECT_NAME || ''.'' || PROCEDURE_NAME end AS procedure_name '+
                           'case when PROCEDURE_NAME is null then OBJECT_NAME ELSE OBJECT_NAME || ''.'' || PROCEDURE_NAME end AS procedure_name '+
                         'FROM USER_PROCEDURES ';
                         'FROM USER_PROCEDURES ';