re-use column/table quoting that's already available on structure_dump

Author: kares

lib/arjdbc/derby/adapter.rb

@@ -304,7 +304,7 @@ def drop_database(name = nil) # :nodoc:
     end
 
     def quote_column_name(name) # :nodoc:
-      %Q{"#{name.to_s.upcase.gsub(/\"/, '""')}"}
+      %Q{"#{name.to_s.upcase.gsub('"', '""')}"}
     end
 
     def add_limit_offset!(sql, options) # :nodoc:

lib/arjdbc/tasks/derby_database_tasks.rb

@@ -22,31 +22,33 @@ def drop
       def structure_dump(filename)
         establish_connection(config)
         dump = File.open(filename, "w:utf-8")
+        
         meta_data = connection.jdbc_connection.meta_data
-        tables_rs = meta_data.getTables(nil, nil, nil, ["TABLE"].to_java(:string))
+        tables_rs = meta_data.getTables(nil, nil, nil, ["TABLE"].to_java(:String))
+        
         while tables_rs.next
-          table_name = tables_rs.getString(3)
-          dump << "CREATE TABLE #{table_name} (\n"
+          table_name = tables_rs.getString('TABLE_NAME') # getString(3)
+          dump << "CREATE TABLE #{connection.quote_table_name(table_name)} (\n"
+          
           columns_rs = meta_data.getColumns(nil, nil, table_name, nil)
           first_col = true
           while columns_rs.next
-            column_name = add_quotes(columns_rs.getString(4));
-            default = ''
-            d1 = columns_rs.getString(13)
-            if d1 =~ /^GENERATED_/
+            column_name = columns_rs.getString(4)
+            default = columns_rs.getString(13)
+            if default =~ /^GENERATED_/
               default = column_auto_increment_def(table_name, column_name)
-            elsif d1
-              default = " DEFAULT #{d1}"
+            elsif default
+              default = " DEFAULT #{default}"
             end
-
             type = columns_rs.getString(6)
             column_size = columns_rs.getString(7)
-            nulling = (columns_rs.getString(18) == 'NO' ? " NOT NULL" : "")
-            create_column = add_quotes(expand_double_quotes(strip_quotes(column_name)))
+            nulling = ( columns_rs.getString(18) == 'NO' ? " NOT NULL" : nil )
+            
+            create_column = connection.quote_column_name(column_name)
             create_column << " #{type}"
             create_column << ( SIZEABLE.include?(type) ? "(#{column_size})" : "" )
-            create_column << nulling
-            create_column << default
+            create_column << nulling.to_s
+            create_column << default.to_s
 
             create_column = first_col ? " #{create_column}" : ",\n #{create_column}"
             dump << create_column
@@ -55,6 +57,7 @@ def structure_dump(filename)
           end
           dump << "\n);\n\n"
         end
+        
         dump.close
       end
 
@@ -71,7 +74,7 @@ def structure_load(filename)
       "(SELECT T.TABLEID FROM SYS.SYSTABLES T WHERE T.TABLENAME = '%s') AND COLUMNNAME = '%s'"
 
       def column_auto_increment_def(table_name, column_name)
-        sql = AUTO_INCREMENT_SQL % [ table_name, strip_quotes(column_name) ]
+        sql = AUTO_INCREMENT_SQL % [ table_name, column_name ]
         if data = connection.execute(sql).first
           if start = data['autoincrementstart']
             ai_def = ' GENERATED '
@@ -87,22 +90,6 @@ def column_auto_increment_def(table_name, column_name)
         ''
       end
 
-      def add_quotes(name)
-        return name unless name
-        %Q{"#{name}"}
-      end
-
-      def strip_quotes(str)
-        return str unless str
-        return str unless /^(["']).*\1$/ =~ str
-        str[1..-2]
-      end
-      
-      def expand_double_quotes(name)
-        return name unless name && name['"']
-        name.gsub('"', '""')
-      end
-      
     end
   end
 end

test/db/derby/rake_test.rb

@@ -51,7 +51,7 @@ def do_teardown
       Rake::Task["db:structure:dump"].invoke
 
       assert File.exists?(structure_sql)
-      assert_match /CREATE TABLE USERS/i, File.read(structure_sql)
+      assert_match /CREATE TABLE "?USERS"?/i, File.read(structure_sql)
 
       # db:structure:load
       ActiveRecord::Base.connection.disconnect!