baza 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb297db4bf6ce61024aa2d6c3eb6150ce3e3e001
-  data.tar.gz: 900c0cbe5f25dfbf0678bd061b708464ec2b2273
+  metadata.gz: a62941ce9303dc76e57c84b8db5045e9ffb060a6
+  data.tar.gz: 88ab7cd45d1f8caf0fdb1139edb27931a3f0dfbc
 SHA512:
-  metadata.gz: 3cbc663078dfc995306e13182a7d03d4c20dd8e8ea199e9eabeb2ba557a5d281cce95c4099aefbf899cf239a145073f1e6a710fb4a44f636446cc05f1421f084
-  data.tar.gz: 53f651203f8a12dc35062b41bdb22a9f370ef813fe794cb1bb4e2cf25fae449a4dc5d9e87b6fb3bfa323141c3525826553e26f5acf391d1d58a78abe2c0b1f9e
+  metadata.gz: e8797dfcd1e18c7d0de33f048e7de2e903caa48c6abb10be47cf0b4e075ebc7607f27373497633ab23e79c5b3064d9ecf110d20a07a063c2904e1b6f0fdf23e1
+  data.tar.gz: 59a1951ceea82bc29831ceeea9751f0755de1bc1ffa7ce89970c2492e51d2bd933eb7c730c190d141468e0ad75f7b10a1137e50aed030e0d3a26808726a54edf

data/VERSION

@@ -1 +1 @@
-0.0.27
+0.0.28

data/baza.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: baza 0.0.27 ruby lib
+# stub: baza 0.0.28 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "baza".freeze
-  s.version = "0.0.27"
+  s.version = "0.0.28"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Kasper Johansen".freeze]
-  s.date = "2017-03-19"
+  s.date = "2017-07-03"
   s.description = "A database abstraction layer, model framework and database framework.".freeze
   s.email = "kj@gfish.com".freeze
   s.extra_rdoc_files = [
@@ -65,6 +65,10 @@ Gem::Specification.new do |s|
     "lib/baza/driver/mysql/index.rb",
     "lib/baza/driver/mysql/indexes.rb",
     "lib/baza/driver/mysql/result.rb",
+    "lib/baza/driver/mysql/sql.rb",
+    "lib/baza/driver/mysql/sql/column.rb",
+    "lib/baza/driver/mysql/sql/create_indexes.rb",
+    "lib/baza/driver/mysql/sql/create_table.rb",
     "lib/baza/driver/mysql/sqlspecs.rb",
     "lib/baza/driver/mysql/table.rb",
     "lib/baza/driver/mysql/tables.rb",
@@ -157,12 +161,14 @@ Gem::Specification.new do |s|
     "lib/baza/table.rb",
     "spec/active_record/models/user.rb",
     "spec/baza/cloner_spec.rb",
+    "spec/baza/sql_queries/generic_insert_spec.rb",
     "spec/drivers/active_record_mysql2_spec.rb",
     "spec/drivers/active_record_mysql_spec.rb",
     "spec/drivers/active_record_pg_spec.rb",
     "spec/drivers/active_record_sqlite3_spec.rb",
     "spec/drivers/mysql2_spec.rb",
     "spec/drivers/mysql_spec.rb",
+    "spec/drivers/pg/columns_spec.rb",
     "spec/drivers/pg_spec.rb",
     "spec/drivers/sqlite3_spec.rb",
     "spec/info_active_record_example.rb",

data/lib/baza/base_sql_driver.rb

@@ -2,24 +2,29 @@ class Baza::BaseSqlDriver
   attr_reader :db, :conn, :sep_database, :sep_table, :sep_col, :sep_val, :sep_index
   attr_accessor :tables, :cols, :indexes
 
-  def self.from_object(_args)
-  end
+  SEPARATOR_DATABASE = "`".freeze
+  SEPARATOR_TABLE = "`".freeze
+  SEPARATOR_COLUMN = "`".freeze
+  SEPARATOR_VALUE = "'".freeze
+  SEPARATOR_INDEX = "`".freeze
+
+  def self.from_object(_args); end
 
   def initialize(db)
     @db = db
 
-    @sep_database = "`"
-    @sep_table = "`"
-    @sep_col = "`"
-    @sep_val = "'"
-    @sep_index = "`"
+    @sep_database = SEPARATOR_DATABASE
+    @sep_table = SEPARATOR_TABLE
+    @sep_col = SEPARATOR_COLUMN
+    @sep_val = SEPARATOR_VALUE
+    @sep_index = SEPARATOR_INDEX
   end
 
   def foreign_key_support?
     true
   end
 
-  def escape(string)
+  def self.escape(string)
     string.to_s.gsub(/([\0\n\r\032\'\"\\])/) do
       case Regexp.last_match(1)
       when "\0" then "\\0"
@@ -31,32 +36,52 @@ class Baza::BaseSqlDriver
     end
   end
 
+  def escape(string)
+    self.class.escape(string)
+  end
+
   alias esc escape
   alias escape_alternative escape
 
   # Escapes a string to be used as a column.
+  def self.escape_column(string)
+    string = string.to_s
+    raise "Invalid column-string: #{string}" if string.include?(SEPARATOR_COLUMN)
+    string
+  end
+
   def escape_column(string)
+    self.class.escape_column(string)
+  end
+
+  def self.escape_table(string)
     string = string.to_s
-    raise "Invalid column-string: #{string}" if string.include?(@sep_col)
+    raise "Invalid table-string: #{string}" if string.include?(SEPARATOR_TABLE)
     string
   end
 
   def escape_table(string)
+    self.class.escape_table(string)
+  end
+
+  def self.escape_database(string)
     string = string.to_s
-    raise "Invalid table-string: #{string}" if string.include?(@sep_table)
+    raise "Invalid database-string: #{string}" if string.include?(SEPARATOR_DATABASE)
     string
   end
 
   def escape_database(string)
+    self.class.escape_database(string)
+  end
+
+  def self.escape_index(string)
     string = string.to_s
-    raise "Invalid database-string: #{string}" if string.include?(@sep_database)
+    raise "Invalid index-string: #{string}" if string.include?(SEPARATOR_INDEX)
     string
   end
 
   def escape_index(string)
-    string = string.to_s
-    raise "Invalid index-string: #{string}" if string.include?(@sep_index)
-    string
+    self.class.escape_index(string)
   end
 
   def transaction
@@ -88,10 +113,15 @@ class Baza::BaseSqlDriver
   def insert_multi(tablename, arr_hashes, args = {})
     sql = [] if args && args[:return_sql]
 
-    @db.transaction do
+    if args && args[:return_sql]
       arr_hashes.each do |hash|
-        res = @db.insert(tablename, hash, args)
-        sql << res if args && args[:return_sql]
+        sql << @db.insert(tablename, hash, args)
+      end
+    else
+      @db.transaction do
+        arr_hashes.each do |hash|
+          @db.insert(tablename, hash, args)
+        end
       end
     end
 
@@ -183,6 +213,20 @@ class Baza::BaseSqlDriver
   # Returns the correct SQL-value for the given value.
   # If it is a number, then just the raw number as a string will be returned.
   # nil's will be NULL and strings will have quotes and will be escaped.
+  def self.sqlval(val)
+    if val.is_a?(Fixnum) || val.is_a?(Integer)
+      val.to_s
+    elsif val == nil
+      "NULL"
+    elsif val.is_a?(Date)
+      "#{SEPARATOR_VALUE}#{Datet.in(val).dbstr(time: false)}#{SEPARATOR_VALUE}"
+    elsif val.is_a?(Time) || val.is_a?(DateTime) || val.is_a?(Datet)
+      "#{SEPARATOR_VALUE}#{Datet.in(val).dbstr}#{SEPARATOR_VALUE}"
+    else
+      "#{SEPARATOR_VALUE}#{escape(val)}#{SEPARATOR_VALUE}"
+    end
+  end
+
   def sqlval(val)
     return @conn.sqlval(val) if @conn.respond_to?(:sqlval)
 

data/lib/baza/database.rb

@@ -11,10 +11,10 @@ class Baza::Database
     @name_was = @name
   end
 
-  def import_file!(path)
+  def import_file!(path, args = {})
     File.open(path, "r") do |io|
       use do
-        Baza::Commands::Importer.new(db: @db, io: io).execute
+        Baza::Commands::Importer.new({db: @db, io: io}.merge(args)).execute
       end
     end
   end

data/lib/baza/driver/mysql/database.rb

@@ -41,9 +41,22 @@ class Baza::Driver::Mysql::Database < Baza::Database
 
     sql << ")"
 
-    return [sql] if args && args[:return_sql]
+    # return [sql] if args && args[:return_sql]
 
-    use { @db.query(sql) }
+    sql = Baza::Driver::Mysql::Sql::CreateTable.new(
+      columns: data.fetch(:columns),
+      indexes: data[:indexes],
+      name: name,
+      temporary: data[:temp]
+    ).sql
+
+    return sql if args && args[:return_sql]
+
+    use do
+      sql.each do |sql_i|
+        @db.query(sql_i)
+      end
+    end
   end
 
   def rename(new_name)

data/lib/baza/driver/mysql/sql/column.rb

@@ -0,0 +1,39 @@
+class Baza::Driver::Mysql::Sql::Column
+  DATA_SQL_ALLOWED_KEYS = [:type, :maxlength, :name, :primarykey, :autoincr, :default, :comment, :after, :first, :storage, :null, :renames].freeze
+
+  attr_reader :data
+
+  def initialize(data)
+    @data = data
+  end
+
+  def sql
+    data.each_key do |key|
+      raise "Invalid key: '#{key}' (#{key.class.name})." unless DATA_SQL_ALLOWED_KEYS.include?(key)
+    end
+
+    raise "No type given." unless data[:type]
+    type = data[:type].to_sym
+
+    data[:maxlength] = 255 if type == :varchar && data[:maxlength].to_s.strip.empty?
+
+    sql = "#{Baza::Driver::Mysql::SEPARATOR_COLUMN}#{Baza::Driver::Mysql.escape_column(data.fetch(:name))}#{Baza::Driver::Mysql::SEPARATOR_COLUMN} #{type}"
+    sql << "(#{data[:maxlength]})" if data[:maxlength]
+    sql << " PRIMARY KEY" if data[:primarykey]
+    sql << " AUTO_INCREMENT" if data[:autoincr]
+    sql << " NOT NULL" if data.key?(:null) && !data[:null]
+
+    if data.key?(:default_func)
+      sql << " DEFAULT #{data[:default_func]}"
+    elsif data.key?(:default) && !data[:default].nil?
+      sql << " DEFAULT #{Baza::Driver::Mysql.sqlval(data.fetch(:default))}"
+    end
+
+    sql << " COMMENT '#{Baza::Driver::Mysql.escape(data.fetch(:comment))}'" if data.key?(:comment)
+    sql << " AFTER #{Baza::Driver::Mysql::SEPARATOR_COLUMN}#{Baza::Driver::Mysql.escape_column(data.fetch(:after))}#{Baza::Driver::Mysql::SEPARATOR_COLUMN}" if data[:after] && !data[:first]
+    sql << " FIRST" if data[:first]
+    sql << " STORAGE #{data[:storage].to_s.upcase}" if data[:storage]
+
+    [sql]
+  end
+end

data/lib/baza/driver/mysql/sql/create_indexes.rb

@@ -0,0 +1,51 @@
+class Baza::Driver::Mysql::Sql::CreateIndexes
+  def initialize(args)
+    @create = args[:create]
+    @indexes = args.fetch(:indexes)
+    @on_table = args[:on_table]
+    @table_name = args.fetch(:table_name)
+  end
+
+  def sql
+    sql = ""
+    first = true
+
+    @indexes.each do |index_data|
+      sql << "CREATE" if @create || @create.nil?
+
+      if index_data.is_a?(String) || index_data.is_a?(Symbol)
+        index_data = {name: index_data, columns: [index_data]}
+      end
+
+      raise "No name was given: '#{index_data}'." if !index_data.key?(:name) || index_data[:name].to_s.strip.empty?
+      raise "No columns was given on index: '#{index_data.fetch(:name)}'." if !index_data[:columns] || index_data[:columns].empty?
+
+      if first
+        first = false
+      else
+        sql << ", "
+      end
+
+      sql << " UNIQUE" if index_data[:unique]
+      sql << " INDEX #{Baza::Driver::Mysql::SEPARATOR_INDEX}#{Baza::Driver::Mysql.escape_index(index_data.fetch(:name))}#{Baza::Driver::Mysql::SEPARATOR_INDEX}"
+
+      if @on_table || @on_table.nil?
+        sql << " ON #{Baza::Driver::Mysql::SEPARATOR_TABLE}#{Baza::Driver::Mysql.escape_table(@table_name)}#{Baza::Driver::Mysql::SEPARATOR_TABLE}"
+      end
+
+      sql << " ("
+
+      first = true
+      index_data[:columns].each do |col_name|
+        sql << ", " unless first
+        first = false if first
+
+        sql << "#{Baza::Driver::Mysql::SEPARATOR_COLUMN}#{Baza::Driver::Mysql.escape_column(col_name)}#{Baza::Driver::Mysql::SEPARATOR_COLUMN}"
+      end
+
+      sql << ")"
+    end
+
+    [sql]
+  end
+end

data/lib/baza/driver/mysql/sql/create_table.rb

@@ -0,0 +1,37 @@
+class Baza::Driver::Mysql::Sql::CreateTable
+  def initialize(args)
+    @name = args.fetch(:name)
+    @columns = args.fetch(:columns)
+    @indexes = args[:indexes]
+    @temporary = args[:temporary]
+  end
+
+  def sql
+    sql = "CREATE"
+    sql << " TEMPORARY" if @temporary
+    sql << " TABLE #{Baza::Driver::Mysql::SEPARATOR_TABLE}#{Baza::Driver::Mysql.escape_table(@name)}#{Baza::Driver::Mysql::SEPARATOR_TABLE} ("
+
+    first = true
+    @columns.each do |col_data|
+      sql << ", " unless first
+      first = false if first
+      col_data.delete(:after) if col_data[:after]
+
+      sql << Baza::Driver::Mysql::Sql::Column.new(col_data).sql.first
+    end
+
+    if @indexes && !@indexes.empty?
+      sql << ", "
+      sql << Baza::Driver::Mysql::Sql::CreateIndexes.new(
+        indexes: @indexes,
+        create: false,
+        on_table: false,
+        table_name: @name
+      ).sql.first
+    end
+
+    sql << ")"
+
+    [sql]
+  end
+end

data/lib/baza/driver/mysql/sql.rb

@@ -0,0 +1,3 @@
+class Baza::Driver::Mysql::Sql
+  AutoAutoloader.autoload_sub_classes(self, __FILE__)
+end

data/lib/baza/driver/pg/columns.rb

@@ -9,15 +9,31 @@ class Baza::Driver::Pg::Columns
       raise "Invalid key: '#{key}' (#{key.class.name})." unless DATA_SQL_ALLOWED_KEYS.include?(key)
     end
 
+    maxlength = data[:maxlength]
+
     raise "No type given." unless data[:type]
     type = data[:type].to_sym
-    type = :serial if type == :int && data[:autoincr]
     type = :timestamp if type == :datetime
 
+    if type == :int && data[:autoincr]
+      type = :serial
+      maxlength = nil
+    end
+
+    if type == :int
+      type = :integer
+      maxlength = nil
+    end
+
+    if type == :tinyint
+      type = :smallint
+      maxlength = nil
+    end
+
     data[:maxlength] = 255 if type == :varchar && !data.key?(:maxlength)
 
     sql = "#{@db.sep_col}#{@db.escape_column(data.fetch(:name))}#{@db.sep_col} #{type}"
-    sql << "(#{data[:maxlength]})" if data[:maxlength]
+    sql << "(#{maxlength})" if maxlength
     sql << " PRIMARY KEY" if data[:primarykey]
     sql << " NOT NULL" if data.key?(:null) && !data[:null]
 

data/lib/baza/driver/pg/database.rb

@@ -63,31 +63,9 @@ class Baza::Driver::Pg::Database < Baza::Database
   CREATE_ALLOWED_KEYS = [:columns, :indexes, :temp, :return_sql].freeze
   # Creates a new table by the given name and data.
   def create_table(table_name, data, args = nil)
-    table_name = table_name.to_s
-    raise "No columns was given for '#{name}'." if !data[:columns] || data[:columns].empty?
-
-    sql = "CREATE"
-    sql << " TEMPORARY" if data[:temp]
-    sql << " TABLE #{db.sep_table}#{@db.escape_table(table_name)}#{db.sep_table} ("
-
-    first = true
-    data.fetch(:columns).each do |col_data|
-      sql << ", " unless first
-      first = false if first
-      col_data.delete(:after) if col_data[:after]
-      sql << @db.columns.data_sql(col_data)
-    end
-
-    sql << ")"
-
-    use { @db.query(sql) } if !args || !args[:return_sql]
-
-    if data[:indexes] && !data[:indexes].empty?
-      table = @db.tables[table_name]
-      table.create_indexes(data.fetch(:indexes))
+    use do
+      @db.tables.create(table_name, data, args)
     end
-
-    return [sql] if args && args[:return_sql]
   end
 
   def rename(new_name)

data/lib/baza/driver/pg/indexes.rb

@@ -1,5 +1,21 @@
 class Baza::Driver::Pg::Indexes
+  attr_reader :db
+
   def initialize(args)
     @db = args.fetch(:db)
   end
+
+  def create_index(index_list, args = {})
+    sqls = Baza::Driver::Pg::CreateIndexSqlCreator.new(db: db, indexes: index_list, create_args: args, on_table: args.fetch(:table_name)).sqls
+
+    unless args[:return_sql]
+      db.transaction do
+        sqls.each do |sql|
+          db.query(sql)
+        end
+      end
+    end
+
+    sqls if args[:return_sql]
+  end
 end

data/lib/baza/driver/pg/table.rb

@@ -160,22 +160,7 @@ class Baza::Driver::Pg::Table < Baza::Table
   end
 
   def create_indexes(index_list, args = {})
-    Baza::Driver::Pg::Table.create_indexes(index_list, args.merge(table_name: name, db: @db))
-  end
-
-  def self.create_indexes(index_list, args = {})
-    db = args.fetch(:db)
-    sqls = Baza::Driver::Pg::CreateIndexSqlCreator.new(db: db, indexes: index_list, create_args: args).sqls
-
-    unless args[:return_sql]
-      db.transaction do
-        sqls.each do |sql|
-          db.query(sql)
-        end
-      end
-    end
-
-    sqls if args[:return_sql]
+    db.indexes.create_index(index_list, args.merge(table_name: name))
   end
 
   def rename(new_name)

data/lib/baza/driver/pg/tables.rb

@@ -39,7 +39,39 @@ class Baza::Driver::Pg::Tables
     tables_list
   end
 
-  def create(name, data, args = nil)
-    @db.current_database.create_table(name, data, args)
+  def create(table_name, data, args = nil)
+    table_name = table_name.to_s
+    raise "Invalid table name: #{table_name}" if table_name.strip.empty?
+    raise "No columns was given for '#{table_name}'." if !data[:columns] || data[:columns].empty?
+
+    create_table_sql = "CREATE"
+    create_table_sql << " TEMPORARY" if data[:temp]
+    create_table_sql << " TABLE #{db.sep_table}#{db.escape_table(table_name)}#{db.sep_table} ("
+
+    first = true
+    data.fetch(:columns).each do |col_data|
+      create_table_sql << ", " unless first
+      first = false if first
+      col_data.delete(:after) if col_data[:after]
+      create_table_sql << db.columns.data_sql(col_data)
+    end
+
+    create_table_sql << ")"
+
+    sqls = [create_table_sql]
+
+    if data[:indexes] && !data[:indexes].empty?
+      sqls += db.indexes.create_index(data.fetch(:indexes), table_name: table_name, return_sql: true)
+    end
+
+    if !args || !args[:return_sql]
+      db.transaction do
+        sqls.each do |sql|
+          db.query(sql)
+        end
+      end
+    else
+      sqls
+    end
   end
 end

data/lib/baza/driver/pg.rb

@@ -46,11 +46,23 @@ class Baza::Driver::Pg < Baza::BaseSqlDriver
 
     if db.opts[:conn]
       @conn = db.opts.fetch(:conn)
-    else
+    elsif db.opts[:db]
       reconnect
     end
   end
 
+  def connected?
+    @conn ? true : false
+  end
+
+  def escape(string)
+    if @conn
+      @conn.escape_string(string.to_s)
+    else
+      PG::Connection.escape_string(string.to_s)
+    end
+  end
+
   def reconnect
     require "pg" unless ::Object.const_defined?(:PG)
 

data/lib/baza/dump.rb

@@ -5,8 +5,15 @@ class Baza::Dump
   # dump = Baza::Dump.new(:db => db)
   def initialize(args)
     @db = args.fetch(:db)
+    @db_type = args[:db_type]
     @debug = args[:debug]
     @tables = args[:tables]
+
+    if @db_type
+      @export_db = Baza::Db.new(type: @db_type)
+    else
+      @export_db = @db
+    end
   end
 
   # Method used to update the status.
@@ -24,12 +31,6 @@ class Baza::Dump
     debug "Going through tables."
     @rows_count = 0
 
-    if @tables
-      tables = @tables
-    else
-      tables = @db.tables.list
-    end
-
     if @on_status
       @on_status.call(text: "Preparing.")
 
@@ -39,10 +40,7 @@ class Baza::Dump
       end
     end
 
-    tables.each do |table_obj|
-      table_obj = @db.tables[table_obj] if table_obj.is_a?(String) || table_obj.is_a?(Symbol)
-      next if table_obj.native?
-
+    each_table do |table_obj|
       # Figure out keys.
       @keys = []
       table_obj.columns do |col|
@@ -54,6 +52,8 @@ class Baza::Dump
       debug "Dumping table: '#{table_obj.name}'."
       dump_table(io, table_obj)
     end
+
+    dump_foreign_keys(io)
   end
 
   # A block can be executed when a new status occurs.
@@ -71,7 +71,7 @@ class Baza::Dump
     create_data.delete(:name)
 
     # Get SQL for creating table and add it to IO.
-    sqls = @db.tables.create(table_obj.name, create_data, return_sql: true)
+    sqls = @export_db.tables.create(table_obj.name, create_data, return_sql: true)
     sqls.each do |sql|
       io.write("#{sql};\n")
     end
@@ -94,7 +94,7 @@ class Baza::Dump
 
 
     @db.select(table_obj.name, nil, unbuffered: true) do |row|
-      rows << row.values
+      rows << row
       @rows_count += 1
 
       if rows.length >= 1000
@@ -111,7 +111,13 @@ class Baza::Dump
   # Dumps the given rows from the given table into the given IO.
   def dump_insert_multi(io, table_obj, rows)
     debug "Inserting #{rows.length} into #{table_obj.name}."
-    sqls = @db.insert_multi(table_obj.name, rows, return_sql: true, keys: @keys)
+    sqls = @export_db.insert_multi(
+      table_obj.name,
+      rows,
+      replace_line_breaks: true,
+      return_sql: true,
+      keys: @keys
+    )
     sqls.each do |sql|
       io.write("#{sql};\n")
     end
@@ -121,4 +127,28 @@ class Baza::Dump
     # Ensure garbage collection or we might start using A LOT of memory.
     GC.start
   end
+
+  def dump_foreign_keys(_io)
+    each_table do |table|
+      next unless table.respond_to?(:foreign_keys)
+
+      table.foreign_keys.each do |foreign_key|
+        # Dump foreign key
+      end
+    end
+  end
+
+  def each_table
+    if @tables
+      tables = @tables
+    else
+      tables = @db.tables.list
+    end
+
+    tables.each do |table_obj|
+      table_obj = @db.tables[table_obj] if table_obj.is_a?(String) || table_obj.is_a?(Symbol)
+      next if table_obj.native?
+      yield table_obj
+    end
+  end
 end

data/lib/baza/sql_queries/generic_insert.rb

@@ -6,6 +6,7 @@ class Baza::SqlQueries::GenericInsert
     @buffer = args[:buffer]
     @return_sql = args[:return_sql]
     @return_id = args[:return_id]
+    @replace_line_breaks = args[:replace_line_breaks]
   end
 
   def execute
@@ -72,10 +73,23 @@ private
         sql << ", "
       end
 
-      sql << @db.sqlval(value)
+      quoted = @db.sqlval(value)
+      quoted = convert_line_breaks(quoted) if @replace_line_breaks
+
+      sql << quoted
     end
 
     sql << ")"
     sql
   end
+
+  def convert_line_breaks(quoted)
+    return quoted unless quoted.include?("\n")
+
+    if @db.postgres?
+      quoted.gsub("\n", "' || CHR(10) || '")
+    else
+      "CONCAT(#{quoted.gsub("\n", "', CHR(10), '")}"
+    end
+  end
 end

data/lib/baza/sql_queries/postgres_upsert_duplicate_key.rb

@@ -62,10 +62,10 @@ private
 
     first = true
     @updates.keys.each do |column_name|
-      sql << ", " if first
+      sql << ", " unless first
       first = false if first
 
-      sql << "'#{@db.escape_column(column_name)}'"
+      sql << "#{@db.sep_col}#{@db.escape_column(column_name)}#{@db.sep_col}"
     end
 
     sql

data/spec/baza/sql_queries/generic_insert_spec.rb

@@ -0,0 +1,26 @@
+require "spec_helper"
+
+describe Baza::SqlQueries::GenericInsert do
+  let(:constant) do
+    const_name = "InfoPg"
+    require StringCases.camel_to_snake(const_name)
+    raise "Constant was not defined: '#{const_name}'." unless Baza.const_defined?(const_name)
+    Baza.const_get(const_name)
+  end
+  let(:db) { constant.new.db }
+
+  describe "#convert_line_breaks" do
+    it "converts line breaks to valid postgres sql" do
+      generic_insert = Baza::SqlQueries::GenericInsert.new(
+        db: db,
+        table_name: "test_table",
+        data: {
+          "test_column" => "data\nwith\nline\nbreaks"
+        },
+        replace_line_breaks: true
+      )
+
+      expect(generic_insert.to_sql).to eq "INSERT INTO \"test_table\" (\"test_column\") VALUES ('data' || CHR(10) || 'with' || CHR(10) || 'line' || CHR(10) || 'breaks')"
+    end
+  end
+end

data/spec/drivers/pg/columns_spec.rb

@@ -0,0 +1,45 @@
+require "spec_helper"
+
+describe Baza::Driver::Pg::Columns do
+  let(:constant) do
+    const_name = "InfoPg"
+    require StringCases.camel_to_snake(const_name)
+    raise "Constant was not defined: '#{const_name}'." unless Baza.const_defined?(const_name)
+    Baza.const_get(const_name)
+  end
+  let(:db) { constant.new.db }
+
+  describe "#data_sql" do
+    it "convert int(11) to integer" do
+      result = db.columns.data_sql(
+        name: "test",
+        type: :int,
+        maxlength: 11
+      )
+
+      expect(result).to eq '"test" integer'
+    end
+
+    it "converts int with auto increment to serial" do
+      result = db.columns.data_sql(
+        name: "test",
+        type: :int,
+        maxlength: 11,
+        autoincr: true
+      )
+
+      expect(result).to eq '"test" serial'
+    end
+
+    it "converts tinyint to smallint" do
+      result = db.columns.data_sql(
+        name: "test",
+        type: :tinyint,
+        maxlength: 11,
+        autoincr: true
+      )
+
+      expect(result).to eq '"test" smallint'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baza
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-19 00:00:00.000000000 Z
+date: 2017-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_enumerator
@@ -372,6 +372,10 @@ files:
 - lib/baza/driver/mysql/index.rb
 - lib/baza/driver/mysql/indexes.rb
 - lib/baza/driver/mysql/result.rb
+- lib/baza/driver/mysql/sql.rb
+- lib/baza/driver/mysql/sql/column.rb
+- lib/baza/driver/mysql/sql/create_indexes.rb
+- lib/baza/driver/mysql/sql/create_table.rb
 - lib/baza/driver/mysql/sqlspecs.rb
 - lib/baza/driver/mysql/table.rb
 - lib/baza/driver/mysql/tables.rb
@@ -464,12 +468,14 @@ files:
 - lib/baza/table.rb
 - spec/active_record/models/user.rb
 - spec/baza/cloner_spec.rb
+- spec/baza/sql_queries/generic_insert_spec.rb
 - spec/drivers/active_record_mysql2_spec.rb
 - spec/drivers/active_record_mysql_spec.rb
 - spec/drivers/active_record_pg_spec.rb
 - spec/drivers/active_record_sqlite3_spec.rb
 - spec/drivers/mysql2_spec.rb
 - spec/drivers/mysql_spec.rb
+- spec/drivers/pg/columns_spec.rb
 - spec/drivers/pg_spec.rb
 - spec/drivers/sqlite3_spec.rb
 - spec/info_active_record_example.rb